51d1aa2f9578dc078505c65a9d27dd2d78e1cc60,server/src/com/cloud/network/guru/PublicNetworkGuru.java,PublicNetworkGuru,getIp,#NicProfile#DataCenter#VirtualMachineProfile#Network#,75

Before Change


            	nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
            nic.setBroadcastType(BroadcastDomainType.Vlan);
            if(!ip.getVlanTag().equalsIgnoreCase("untagged"))
            	nic.setBroadcastUri(URI.create("vlan://untagged"));
            else
            	nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
            nic.setFormat(AddressFormat.Ip4);

After Change


            nic.setIp4Address(ip.getAddress());
            nic.setGateway(ip.getGateway());
            nic.setNetmask(ip.getNetmask());
            if(ip.getVlanTag() != null && ip.getVlanTag().equalsIgnoreCase("untagged")) {
                nic.setIsolationUri(URI.create("vlan://untagged"));
                nic.setBroadcastUri(URI.create("vlan://untagged"));
                nic.setBroadcastType(BroadcastDomainType.Native);
            } else if (ip.getVlanTag() != null){
                nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));